automake still doesn't support libsomething_la_LDFLAGS, so fix the build

2002-01-02  jacob berkman  <jacob@ximian.com>

	* gtk/Makefile.am (LDFLAGS): automake still doesn't support
	libsomething_la_LDFLAGS, so fix the build again

diff --git a/ChangeLog b/ChangeLog
index 1d55845ddfe9dd414019d4e13e17dba5bc965726..fd45653a47a9225a75184307ab9024700bdd3027 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-02  jacob berkman  <jacob@ximian.com>
+
+       * gtk/Makefile.am (LDFLAGS): automake still doesn't support
+       libsomething_la_LDFLAGS, so fix the build again
+
 2002-01-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1d55845ddfe9dd414019d4e13e17dba5bc965726..fd45653a47a9225a75184307ab9024700bdd3027 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2002-01-02  jacob berkman  <jacob@ximian.com>
+
+       * gtk/Makefile.am (LDFLAGS): automake still doesn't support
+       libsomething_la_LDFLAGS, so fix the build again
+
 2002-01-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1d55845ddfe9dd414019d4e13e17dba5bc965726..fd45653a47a9225a75184307ab9024700bdd3027 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-01-02  jacob berkman  <jacob@ximian.com>
+
+       * gtk/Makefile.am (LDFLAGS): automake still doesn't support
+       libsomething_la_LDFLAGS, so fix the build again
+
 2002-01-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1d55845ddfe9dd414019d4e13e17dba5bc965726..fd45653a47a9225a75184307ab9024700bdd3027 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-01-02  jacob berkman  <jacob@ximian.com>
+
+       * gtk/Makefile.am (LDFLAGS): automake still doesn't support
+       libsomething_la_LDFLAGS, so fix the build again
+
 2002-01-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1d55845ddfe9dd414019d4e13e17dba5bc965726..fd45653a47a9225a75184307ab9024700bdd3027 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-01-02  jacob berkman  <jacob@ximian.com>
+
+       * gtk/Makefile.am (LDFLAGS): automake still doesn't support
+       libsomething_la_LDFLAGS, so fix the build again
+
 2002-01-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1d55845ddfe9dd414019d4e13e17dba5bc965726..fd45653a47a9225a75184307ab9024700bdd3027 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-01-02  jacob berkman  <jacob@ximian.com>
+
+       * gtk/Makefile.am (LDFLAGS): automake still doesn't support
+       libsomething_la_LDFLAGS, so fix the build again
+
 2002-01-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1d55845ddfe9dd414019d4e13e17dba5bc965726..fd45653a47a9225a75184307ab9024700bdd3027 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-01-02  jacob berkman  <jacob@ximian.com>
+
+       * gtk/Makefile.am (LDFLAGS): automake still doesn't support
+       libsomething_la_LDFLAGS, so fix the build again
+
 2002-01-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 5e5a1b3ceb8523f1664a761d4e3f9f2a0a47c46a..eb741ae2d1ed094747afa9dd52f298f7fbd64594 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -72,6 +72,7 @@ LDFLAGS = @STRIP_BEGIN@ \
        @LIBTOOL_EXPORT_OPTIONS@                                \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la         \
        $(top_builddir)/gdk/@gdktargetlib@                      \
+       $(libgtk_win32_1_3_la_ldflags)                          \
        @GTK_DEP_LIBS@                                          \
 @STRIP_END@
 
@@ -580,7 +581,7 @@ libgtk_win32_include_HEADERS = $(gtk_target_headers)
 libgtk_win32_1_3_la_SOURCES = $(gtk_target_sources)
 libgtk_win32_1_3_la_LIBADD = $(gtk_win32res_lo)
 libgtk_win32_1_3_la_DEPENDENCIES = $(gtk_def)
-libgtk_win32_1_3_la_LDFLAGS = $(gtk_win32_symbols) -lwsock32
+libgtk_win32_1_3_la_ldflags = $(gtk_win32_symbols) -lwsock32
 endif
 EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-linux-fb-1.3.la libgtk-win32-1.3.la